cleaning up some changes