formatting pass
Merge remote-tracking branch 'origin/master' into JackBranch1.0
Merge remote-tracking branch 'origin/master' into JackBranch1.0
Tweeking class feels