MBH: clean up of run form