Issue #61: tidy up per review