Redid debug print formatting