Issue #301 - code cleanup