Some cleaning up and renaming of file