Tidied more of the source