more cleanup
still working on it