Remove namespaces for redability
Merge branch 'develop'