migration to neater java 1.8