Tidied up some formatting