Some minor clean up