couple of minor fixes - use FileUtils, drop instance var