misc: refractor