Just some more stuff on java 8