Tidying things up

https://map.bnnd.eu.org/user/RichardB/diary/5754