Refactoring to kontent
Refactoring
More refactoring to kontent