Cleaned the ugly switch for a fresh function

see numberCheck
Cleaned some more code + added some styling