Attempt to fix all indentation issues