couple minor clean ups