hardcoded file separator replaced with File.separator, code cleanup