Do minor clean up