streamline code
merging