more cleanup. integrated w/ Chrome test app. it works