clean up use of status a bit.