java 8 -ify some things