No sense in explicit FILE_SEPARATOR (and complicated formatting) when you're about to call MapName() anyway; same goes for the changes below.