#319 formatting