Removed the use of unless as a 1 statement modifier.
Refactored the use of instance variables and rename the catalog method.