Rename methods to be more descriptive
Refactor common code