better refactor