Removed unnessesary code and comments