small cleanup updates