Moved to Java8! Converted some anonymous classes to lambda expressions.