Code-Cleanup, Java8 code update