more cke refactoring