Cleanup and minor namespace change