Fixed code convention errors