Refactored with partials for comments