8th Upload.

Polished up by findBugs tool.