Minor refactoring to Hand class