code cleanup up fix for issue #8