Random refactoring.