Some minor clean up

See title