Be consistent with class method syntax

Mixture of `class << self` and `self.method` in the same class - this reads more cleanly.