Style updates; fixed lingering lint errors.