Fix issue with import (kitchen) and refactoring the code.