Minor tweaks, reorganization