Cleaning up Dir/Mult code