Final pass at boilerplate refresh