Fix scope redeclaration
Fixup trailing whitespace