#77 refactor part 1 ok