Source compatibility now Java 7+
Simplified unnecessary explicit type arguments