Cleaned up the use of namespaces in header files
Static functions removed from header