Issue 155: formatting update