Refactoring core into KissHelper