Add Malaysian / improve cleanup function