Eliminate comments, fix some lines > 80 symbols