Refactor cuke