Package should use full namespace
Clean up some code