[REFACTOR] use class methods as wrappers for instance methods