Minor improvements

You're welcome.