Removing unecessary comments, fixing bugs due to feedback