Format cleanup
Added stuff laying around
Update