#168: Cleanup, update the Changelog