update to Java 7, use <> for constructors. it wasn't very effective