Cleaning up namespace, adding documentation