[MRELEASE-1023] Minor code cleanups

This closes #22
8 files changed