Cleaned up some changes.