Refactoring: Moved methods out