Issue #672: Refactor further to make code easier to follow
Issue #672: Refactor further to make code easier to follow

lizards-and-pumpkins/catalog,lizards-and-pumpkins/catalog,lizards-and-pumpkins/catalog