Fix indenting and untabify