Address comments in PR27, and minor tear-down cleanups
Merge pull request #28 from ska-sa/PR27-fixups

Address comments in PR27, and minor tear-down cleanups