Refaktoring java finished (part 1)