Altering comments and cleaning up.