Print statements cleaned up