Tidying up and updating README