Tidied some formatting