cleanup
changed selectors