Selectors clean up #151