Made calculator better