refactor javitasok