a bit of cleanup

as discussed with @mikedewar