Another minor clean up