kiss: minor refactoring