45d22583b4 Mostly style changes, a couple new methods and fixes. Tweak file structure a bit. (cherry picked from commit a706ef3272)
45d22583b4
a706ef3272