major cleanup
better namespace