streamline a bit