Fix code conventions