Some reformatting to make things a bit more readable