Print method refactor