Improve java