Made diagnostic output clearer