Tidyup following code review