cleanup
some changes
temp