Minor cleanup and confirm the foundation of plugin manager.