refactor and improve number entry