improve ONELANG pattern