Refactored print classes