Code cleanup; Changelog updates