Refactored some kinds