Update to java 8

Updating to java 8, making conditionals lambda based to clean things up