Tab refactor