Stylistic refactorings

- Try keep within 80 chars
- Reduce string repetition
- Smaller methods
- Fewer turnery operators

Use it / Don't use it - it's up to you.  They are fairly opinionated changes