improve style, improve machine mapping