Began cleanup of file. Still much to do.