Tidied up per PR comment