refactor presentation