Refactor the Presentation class