quick code cleanup
clean up header location
more quick cleanup
Merge pull request #8 from rwwarren/dev

Dev