fix latest merge
more coding conventions