ensure clean and consistent "namespace" usage

• remove some missplaced ;
• ensure end of a namespace is clearly visible
• use same formatting when using namespace