Minor tidy-up in the workspace