More comments/cleanup