Massive indentation rework. AGAIN.