Refactor kinet a bit
Refactoring from early April