Refactor Trend a bit