Develop

General clean up of code and namespacing