Finished Hand refactoring