Refactoring + Changelog