some minor clean ups