some class namespace cleanup
More class cleanup