do some small refactor