Issue #92 Code clean up.