cleaning up files, new header