Refactor
Fix typo
This was a bit of a mess
Make clearer
Tidy up
Put in block