Rearranged method naming. Added calls to methods.