Refactor - removed redundant code