minor tidy changes