Fixes in coding conventions