issue #31 more formatting