Minor coding improvement