Fix invalid struct tags and remove unreachable code.
Merge pull request #346 from nuss-justin/vet

Fix invalid struct tags and remove unreachable code.