Reformat comments on request
Add request type-specific fields