Improved Calculator (tabs and other code conventions)