small refactor, decrease code smell