A refactor to make things more Java 8