Style tweaks. Added Todo attribution.