Update Presenters (#30)

- Cleanup
- Fix issue #30