Clean up and Commenting