Formatting.
Whitespace.
Merge remote-tracking branch 'upstream/master'
Refactored some more.