Fixed Namespacing and some formatting