Upper case class name and get rid of 'self' in return values of class methods