refactoring and changelog.txt