#2 cleaning up catalog model