Refactor presenter, update spec