small refactoring to fight the smell