Some tabulations refactoring