[Issue #195][fixing] fixed code conventions