Build with JDK7, clean code