Revert "enhanced code base"

This reverts commit 8772ee9ce9299c0b3dc6b7a693bf2358fe985afd.