Cleanup
Coming along
more cleanup