Cleaned up catalog utility