Some cosmetic changes to calc