Improve code readability + bug fixes

Improved readability of the code and fixed a bug with resurrection
(would return to deck, not the hand as needed).