cleaned up calculator design