Client reformat code and moved to java 1.8