Refactored deck loading