Tidied up quite a bit, nothing new just formatting