Goimports run to improve readability