following gregs peer review consolidate some namespaces, change parenthasis