cleanup and namespacing

#4