Refactoring a bit more.