clean up selector and options logic