more simplification in pushi code