microscopic cleanup
more clean up