kitchen: code cleanup