Change header value reading code to use enum constants and lambdas

Change header value reading code to use enum constants and lambdas #133