Code cleanup and a CHANGES entry