[res] Review and format clean up.