02: Use class << self for class methods
02: Use better names