formatting fixes, moved pricing to header
Merge pull request #425 from agoddard/master

formatting fixes, moved pricing to header