[Issue #366][fixed] fixed code conventions