Cleaned up some changes