A couple of optimisations

Hopefully these leave the code still as readable and are not too premature
(you'll need to ignore the github repo name change in the README.md)