code cleanup for Issue #150