Removed Duplicate Code