consolidate trait down a lot