First make it work then make it work better

in other words “refactoring”.