Minor coding style adjustments