Starting to refactor by renaming some methods.