Incorporate feedback from @jferris
Incorporate feedback from @calebthompson
Incorporate feedback from @gylaz
Incorporate feedback from @gabebw
Little more style update