Reviewed/ Simplified/ Removed unnessesary code