+ Removed redundant code