Finally fix all indentation issues (thanks grep)