Refactor all methods out of the constructor