minor clean ups