@nicklewis: Have tidied up