Clean up, Fix print function