more style changes
Merge remote-tracking branch 'github/ryan-dev'