refactor + kina