More cleanup.
Cleanup
Shrinking indentations.