Ridding this of icky file names