We were dynamically calling methods and it was confusing. This commit
refactors the code so we are more explicit in the methods we are
calling.