Just suggestions, functionality maintained.

I'd be happy for you to turn down this pull request, but these are the kinds of things you can think about doing differently or not in your future TH work. Don't let any of these suggestions detract from your good work so far :)