[Issue #366][updating] applied code conventions