Issue #48 improve coding style