Finished extracting static modules to classes and instance methods