Removed Redundant code and comments