[cosmetic] more goimports changes