todo comment cleanup