Unify Simplify methods using type constraints
Cleanup redundant bits