small refactoring and updated release notes