Better whitespace in calc