code standard fixes - mostly namespaces and whitespace