Improve formatting of computation expressions

Fix #88