Slight update with some stylistic fixes