fixes for code conventions