some cleanup
some update