poly: remove extra semicolon
do some whitespace janitor work
Do not use namespace using-directives.