General improvement of code:
- use of Java7 constructs
- fix code hints from static code checkers