minor tidy ups