Refactor trait table checker