fix silly bug, cleanup
cleanup