Tabs to spaces, and minor formatting