Moved to more Java 8 idioms like streams, Optional.of(T), etc.