trivial improvements