[REFACTOR] one less method