Start fixing indentation issues