reorganize
more clean up