Indent cleanups