Issue #27 updating the formatting