BuildDiff: cleanup imports and make slightly more readable

Created by  Cole Helbling  on January 10, 2022
ZAISBSNHOM55DA37RKIOPUWH4CAGPGXUJJMPB7CFQWFP4RKLVKEQC
In channels
upstream
main
Change contents