Minor coding convention changes