Indentation and style fixes.