shorted file names
cleaned up