Tabs refactoring