code convention changes