Fixing up spacing and removing unneeded comments.