'Random' refactoring.