MBH: basic useability cleanup