Reindent with tabs, minor style changes