just some minor clean up