Removed some unneccesary comments and code