more minor tidy ups