A night full of rewriting and tidying