Cleaned up a great deal.