more java 8 refactoring