Refactored to render comments via partials