Tidied up al ittle