Calculator with some changes, which made code clearer.