Code cleanup
Changelog