Minor tweaks
Misc. reorganization