Consolidate and simplify a lot