fixed some convention errors