some java 8 refactorings