finished styling
Merge pull request #63 from jbwilmoth/final_style

finished styling