cleanup
some changes