Reformatting the files and deleting unused copied code