cleaned up files and file names