Refactored class methods to instance methods