Cleaned up filepaths