DoF: code cleanup
DoF: code cleanup

- mostly rename variables
google/filament,google/filament,google/filament,google/filament,google/filament,google/filament,google/filament,google/filament,google/filament,google/filament,google/filament,google/filament