Revert "candywrapper: code cleanup"

This reverts commit a6199d83f6fce0bb0197f373b94dcde77682188f.