Cleaned up some of it.