Added private utility construtors
More inner classes converted to static inner classes
Merge pull request #1498 from pveentjer/findbugs

Findbugs