removed references to File.separator