Minor changes to the files, some cleanup