Moved some variable declarations that were defined in an outer scope

Removed whitespace
Merge branch 'master' of https://github.com/n1ghtmare/corefx