Just some minor clean up