Removed excess comments, extra blocks of code