removed last few selfs and refactored class methods into instance methods.