Fixing code conventions #332