some changes =\
clean up