[MRESOLVER-88] Code style cleanup to use Java 7 features

This closes #34
225 files changed