More reorganization and prettification