Clean up & Commenting