Tidied assemblies and references