Tidied, and fixed wind formatting