tad more clean up