code cleanup, fix for ReplaceInputStream