Cleaned up the file headers a bit