streamline a little