Make if statements consistently styled.
Merge pull request #1 from martindale/improve/style

Further Style Updates