Issue #157 fix code conventions