Removed DIRECTORY_SEPARATOR where unnecessary.