Further improve references