refactor - remove redundant code