Refactor selector step logic