Tidied up references.