Cleanup merge and renaming of functions, reduced output moser180