more java8 refactoring