Add Agents in Spaces
Code Cleaning & Commenting