Removed unneccesary code and comments