Working to produce reasonably pretty code