code cleanup, changes to changelog