converted to java 8 and ran code cleanup