Small tab refactoring