minor reformat

move "def self.X" into "class << self..." block. preparation for adding more class methods.