-Removed redundant code