Minor code convention changes