streamlined things a bit