Refactor to move valid input selection into InputHelper
Refactor to move valid input selection into InputHelper
Refactor various classes