Tidying up
Tidying up macros ns