Code cleanup from review comments for mflm flort.