[REFACTORING] use non-static methods