Tidied some stuff