MBI - code cleanup