cosmetic refactoring of p07.clj