On-going tidy-up following internal showcase