More consistent style when outputting (#5)