formatted calculator.xml to be prettier; is essentially complete