Minor coding style improvements