More refactoring of methods