[issue #40] minor implementation notes and cleanups