Revert "Code design #2"

This reverts commit 7834e329b57c7fdfb97d9e6f23a4de9c5d36803d.