Cleaned up the use of namespaces and includes