A little reorganization and a few tweaks