moved kind handler to method