Refactoring, added functionality for hand and deck