cleaned up namespace a smidge