Tidying, rearranging and clarifying.