Mondo code cleanup