pmd stuff, renaming variable
Merge branch 'master' into networking
Fixed findbugs issues