Cleaned up some of the changes.