Removing comments and changing alignments