Refactored even further to clean-up menu and option selection (choose option). User story #4 looking better than ever!