Code Cleaning and Commenting