Beautified it. Just beautified it.
Changes to a little bit of everything
Merge remote-tracking branch 'origin/bfox'