JDK8 extension - minor code cleanup