cleaned up ns macros