requested coding style improvements

includes improvements from pull request #53