cleanup, tabs, etc