code cleanup
more cleanup