More polish
Indented things properly