Issue #286 fix code conventions