issue #319. Fixed up some style issues.