Various Tweaks

Mostly style related