Misc cleanup and organization changes.