[COMMENT] refactoring