Coding style minor fixies