Source tidying