Removing unneeded code
Updating namespacing to match conventions