trivial, code clean up