streamline code #126