Commenting & cleaning up