fix some coding convention issues