streamline code..