clean up
clena up more