Indenting forms too
Cleanup