rewrite to be terser