Reworking for Older Versions of Java

Took out lambda