Refactored Caculator, added more flow control for incomplete/string type  user inputs