code cleanup - issue #742