migrating mooltipass code to new coding convention (sorry Darran...)