un-hypenate and simplify v2.1-