switched some instance methods to class methods in the classes folder