Fixing code conventions