refactored presenttion code