golint and go vet fixes
Avoid make and new
Eliminate iota stuttering