Tidy up
Merge branch 'issue519_tidyup' into dev