refactor, fill metoda