BRS: Added some formatter stuff, and cleaned up some spacing to be a bit neater.