Fix indentation
More indentation and style fixes