Fixed coding convention issues as given by the automatic