more styling
Merge pull request #27 from johnw335/styling-changes-part-2

more styling