No more need to manualy replace '>': Title works now.
Removed some TODOs and whitespace cleanup.
Removed TODO which seems to never matter in real live.