Some more preparation for Java 8 Lambda expression style