Improve calculator