clean-up tabs and such