[Issue #363] fixed code conventions