some cleanups, mainly tabs and spaces.