Revert "mashed code"

This reverts commit 904f5e3e5372a39531694b9466c1db9873155ff8.