Small corrections to formatting output