final cleanup of issue #5