code conventions fixes