Fix indents and other stuff