Cleaning up comments and spacing.