bit of cleanup/housekeeping