Checkstyle improvments & few JDK7 cleanups