Small refactor
Tidied up