formats: Converted class methods to instance methods