Revert "Code design"

This reverts commit 177f7c8a7574167c0c7f0ad88b4c020817ed6ca1.