Indent/style cleanups