Some tidying, some preparation