Fix a lot of indentation issues