Clean up comments and changelog