NXP-13313: cleanup and format
NXP-13313: git checkout must be quiet