Issue #110 - Code cleanup