#13 minor tidy