get rid of lots of justs, too many justs!