refactor
improve java target
reformat