Minor coding style modifications