Code cleanup & Commenting.