Fix indenting problem (and style tweaks)