combined files cleaned up formating