Fix various indentation issues