Refactor Human and Row a little