issue #31 little bit more formatting