More refactoring, method encapsulation