Fix Coding convention issues