Commenting/code cleanup