Rearrange file, use self. instead of class << self