Enhance with java 8 list comprehension.