Clean-up Tabs & Comments