using java 6 and removing diamond operators