Tidying up bit and pieces