more refactoring
some stuff
some other good stuff
a really nice clean up
cleaning up ns declaration