ok bit of code cleanup
more cleanup