green: part 2, finished the refactoring
updated the dog-food script