Refactor presentation