General improvement of code:
- use of Java7 constructs