package windows: simplify