Refactored to add methods to print