Include placeholders in format strings
Remove unreachable code
Merge pull request #3 from DanielHeath/govet_compliance

Govet compliance