Issue #9: code reformatting
Issue #9: revert accidental check-in