Shell/3909 2

Style fixes from @squamosity work in progress branch. Haven't touched base on the status of all the last minute style changes.

But pulled everything from that branch and put it on a PR here so at least we have something if we run out of time.

[endlessm/eos-shell#3909]