Tabs to spaces, small bit of cleanup