streamlined a few things