Minor coding style clean up