Issue #44: grammer and format fix