more cleanup, this time making the file names less cumbersome