Just a bit more refactoring