remove jquery, better selectors