Incidental tidying of code