Simplify assemble.ml
Simplify creation of units state