Minor changes

Changed a bunch of instance methods into class methods.