Improve readability of Toaster code (incl. Java 8 lambda, static import)