Another untabify
Fixing some other whitespace issues