code cleanup and changelog