Just moved class methods up in file and moved `def self.` methods into `class << self`.