Additional refactoring of class methods.