address code inspection issues

* mostly visibility and final declarations
* removed unused class
* use Java7 syntax where possible