Cleanup in loadFiles to use more generic var names