Fixes #29=04

Style changes as discussed with  bencorlett