MOSES -- miscellaneous minor cleanup

some trite whitespace changes, some minor code movement.