Fixed loads of indentation issues