Tidied some spaces