cleaned up var declarations
Merge branch 'groovyshvi' of github.com:4larryj/groovy-core into groovyshvi
cleaned up whitespace