Cleaned up namespaces and some DocBlock