A few style adjustments related to pull request #168