Made some necessary changes to file clean up