Removed bareword fh, minor changes