More massive method refactoring and simplification