Fixed indentation; cleanup still works.
construct_mef now works