Migrating all remaining code to Java 8 + Either