Minor tweaks
Cleanup