Revert "improve design"

This reverts commit 7f7721bbaa246e021c84ff5ec1d679cd558a854e.