minor cleanup updates