Don't use make(XX, 0) per golint suggestion
Fix naming of variables