Revert "Clean up design"

This reverts commit 2412cb29fd085a8502ed4c8c2438540f75e224be.