Tidied loose ends