cleanup
added namespace
more cleanup