feature/patch small fixes to namespacing and code style