Minor tweaks
Cleanups