Partial refactoring of methods to align with standards