Moved to Java 8. Code cleanup.