categories:minor improvements
suggested by @czpython