fixed code conventions violations