Fix delta and refactor Kaffeh class