Tidier code formatting.