refactor kitchen and environments