Renaming and comments
Upgraded to new minor Java version
Some inpection commit after migration to IDEA12.1