Change class methods to instance methods