Complete Java8 re-factor