Tabs and comments optimized