Fixed some convention issues