Comments/cosmetic cleanup