hlim10 lchen59 : Refactoring Spinner and deleted unused class