Tweaked input file handler