a bit more cleanup
Simplified
consolidated a redundant property
Library-ize pop_pop_win.stage