Some cleanup as part of issue #10 and #11