Add some readability tweaks
Add note about injectables, use reduce
Organize todos
Rename presenter method