Quick refactoring.