fix and small refactor