refactor - remove dublication