Merge branch 'feature/tidy-up' into develop