Code style minor changes