Code Clean-Up & Commenting