do small refactoring