Commenting and naming cleanup