Indentation fixes

Enforce uniform indents throughout