Update references and formatting