EntityViewer: Java 7 changes, formatting and minor code review