First initial code review

A quick initial code review - more in an email I’m about to send
Merge pull request #1 from duncanhodges/master

First initial code review