Revert "attempt at cleaning things up (broken)"

This reverts commit 1236cd1c3cd41bdcabfde32a063fe75640138674.
Revert "Revert "attempt at cleaning things up (broken)""

This reverts commit 3f24793f3cddc5708a2ff55675319a1adfc1fab6.
fix blanking curl effect