Adding a little bit of refactoring