Litt mer refactoring.