Tidy up the first implementation and the README