Cleaning up the changelog and comments