Various Tidying up