More cleaning
Adds mreturn
v1.4.2