Style cleanup - adding more sensible indentation
Merge pull request #1 from phayes/master

This is a pull request