Major styling update
Merge pull request #17 from GLoganDR/prim

Major styling update