Some little bit of refactoring