cleaning up
minor style change
Merge remote-tracking branch 'origin/master'