Code cleanup
more cleanup