Refactoring a bit