Refactor Presentation