clean up and some changes