little bit of refactoring