Tabs to spaces, some additional comments and clean-up