Refactor Humans classes