adding some comments cleaning up wfMessage