moving to java 7
moving to java 7, cleaning up checkstyle issues