Better selector to remove if statement