Spaces / Tabs Clean Up

Removed my other PR, merged my spaces branch in to master so I could resubmit it from that branch instead. Shrugs.