Tidied some stuff.