small refactor, update changelog