New Mo stuff and remove trailing whitespace.