Refine, fix worning for java 8