Update with style tweaks made for issue #1.