Issue #159 - Code cleanup