Tided up code in README and tests