configkitchen: code cleanup