simplify code for testing, make verbose clearer