clean up, use plain jquery selectors