Mooore clean up