minor clean ups works