Started cleaning up of file headers...