28: Refactored public/index